projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
65c67b4
)
xsm:acm: fix a null dereference bug.
author
Keir Fraser
<keir@xensource.com>
Fri, 28 Sep 2007 14:05:11 +0000
(15:05 +0100)
committer
Keir Fraser
<keir@xensource.com>
Fri, 28 Sep 2007 14:05:11 +0000
(15:05 +0100)
Signed-off-by: George Coker <gscoker@alpha.ncsc.mil>
xen/include/xsm/acm/acm_hooks.h
patch
|
blob
|
history
diff --git
a/xen/include/xsm/acm/acm_hooks.h
b/xen/include/xsm/acm/acm_hooks.h
index 54bd15e2a00162aef45a085179c4eb8c559bb837..bb6ed02c31e3700914ef95993a152dadc2384fa2 100644
(file)
--- a/
xen/include/xsm/acm/acm_hooks.h
+++ b/
xen/include/xsm/acm/acm_hooks.h
@@
-284,17
+284,12
@@
static inline int acm_domain_create(struct domain *d, ssidref_t ssidref)
} else if ((acm_secondary_ops->domain_create != NULL) &&
acm_secondary_ops->domain_create(subject_ssid, ssidref,
domid)) {
- /* roll-back primary */
- if (acm_primary_ops->domain_destroy != NULL)
- acm_primary_ops->domain_destroy(d->ssid, d);
rc = ACM_ACCESS_DENIED;
}
if ( rc == ACM_OK )
{
acm_domain_ssid_onto_list(d->ssid);
- } else {
- acm_free_domain_ssid(d->ssid);
}
error_out: